Remove stray conflicty markar that the VCS somehow ignored.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa07f2ded55d7755bb31bf5b5637132a090c8c35..35627f458bcfd9f22b1283374a326984bf3a6e50 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
 
        * vc/vc-git.el (vc-git-print-log): Add --follow option to command,